Auto merge of #1301 - brson:installer-next, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 16 Feb 2015 06:06:41 +0000 (06:06 +0000)
committerbors <bors@rust-lang.org>
Mon, 16 Feb 2015 06:06:41 +0000 (06:06 +0000)
Needs to land immediately after https://github.com/rust-lang/rust/pull/22256.

1  2 
Makefile.in

diff --cc Makefile.in
Simple merge